use MAX priv->width, alloc.width when allocating the bin_window,

2006-07-18  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktreeview.c (gtk_tree_view_realize): use MAX
	priv->width, alloc.width when allocating the bin_window,
	(gtk_tree_view_bin_expose): don't overrun bin_window when drawing
	the flat box.

diff --git a/ChangeLog b/ChangeLog
index 7b6691afdf4f9cc208b768a2ae0225bce7b5479d..84059dcfe673e4ea3228a7e85f62ff088aa5123b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-18  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_realize): use MAX
+       priv->width, alloc.width when allocating the bin_window,
+       (gtk_tree_view_bin_expose): don't overrun bin_window when drawing
+       the flat box.
+
 2006-07-17  Richard Hult  <richard@imendio.com>
 
        * gtk/gtkdnd-quartz.c: (gtk_drag_begin_internal): Set an empty

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7b6691afdf4f9cc208b768a2ae0225bce7b5479d..84059dcfe673e4ea3228a7e85f62ff088aa5123b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-07-18  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_realize): use MAX
+       priv->width, alloc.width when allocating the bin_window,
+       (gtk_tree_view_bin_expose): don't overrun bin_window when drawing
+       the flat box.
+
 2006-07-17  Richard Hult  <richard@imendio.com>
 
        * gtk/gtkdnd-quartz.c: (gtk_drag_begin_internal): Set an empty

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 17fda0b48994ff202f2a9a2e572cd8ce6dbc4d7c..ff278f487f977f2f0859c01a48711c6213d4e34b 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1728,7 +1728,7 @@ gtk_tree_view_realize (GtkWidget *widget)
   /* Make the window for the tree */
   attributes.x = 0;
   attributes.y = TREE_VIEW_HEADER_HEIGHT (tree_view);
-  attributes.width = tree_view->priv->width;
+  attributes.width = MAX (tree_view->priv->width, widget->allocation.width);
   attributes.height = widget->allocation.height;
   attributes.event_mask = GDK_EXPOSURE_MASK |
     GDK_SCROLL_MASK |
@@ -4121,7 +4121,8 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
                           widget,
                           "cell_even",
                           0, tree_view->priv->height,
-                          bin_window_width, bin_window_height);
+                          bin_window_width,
+                          bin_window_height - tree_view->priv->height);
     }
 
   if (node == NULL)